Fix the stupid windows translation bug.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4090 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/gui/mainwindow.cpp b/gpsbabel/gui/mainwindow.cpp
index 56a8913adbb6500dbbb48c336d6e0460ac3d8338..ff67d893a959b1e416ca85bfcfe2c23848a1c9ec 100644 (file)
--- a/gpsbabel/gui/mainwindow.cpp
+++ b/gpsbabel/gui/mainwindow.cpp
@@ -247,8 +247,7 @@ void MainWindow::createLanguageMenu(void)
     defaultLocale.truncate(defaultLocale.lastIndexOf('_')); // e.g. "de"
 
     langPath = QApplication::applicationDirPath();
-    langPath.append("/translations");
-//fprintf(stderr, "Looking in %s\n", qPrintable(langPath));
+    langPath.append("/translations/");
     QDir dir(langPath);
     QStringList fileNames = dir.entryList(QStringList("GPSBabelFE*.qm"));
 
@@ -302,9 +301,15 @@ void MainWindow::loadLanguage(const QString& rLanguage)
     QLocale locale = QLocale(currLang);
     QLocale::setDefault(locale);
     QString languageName = QLocale::languageToString(locale.language());
-    switchTranslator(translator, QString("gpsbabelfe_%1.qm").arg(rLanguage));
-    switchTranslator(translatorCore, QString("gpsbabel__%1.qm").arg(rLanguage));
-    switchTranslator(translatorQt, QString("qt_%1.qm").arg(rLanguage));
+    // It's baffling to me that this is required.  On Mac, we absolutely do not have to do this.
+#if defined (Q_OS_WIN)
+#define LANGUAGE_DIR "translations/"
+#else
+#define LANGUAGE_DIR ""
+#endif
+    switchTranslator(translator, QString(LANGUAGE_DIR "gpsbabelfe_%1.qm").arg(rLanguage));
+    switchTranslator(translatorCore, QString(LANGUAGE_DIR "gpsbabel__%1.qm").arg(rLanguage));
+    switchTranslator(translatorQt, QString(LANGUAGE_DIR " qt_%1.qm").arg(rLanguage));
   }
 }
 

diff --git a/gpsbabel/gui/makesetup.bat b/gpsbabel/gui/makesetup.bat
index f9f5c4867f5f89a86ab09db423b71abeb73e21db..27f93c8dea3698333431cfa23d9948706fab0606 100644 (file)
--- a/gpsbabel/gui/makesetup.bat
+++ b/gpsbabel/gui/makesetup.bat
@@ -13,11 +13,15 @@ mkdir qtdir\plugins\imageformats
 mkdir qtdir\mingw\r
 \r
 rem Basic Qt runtime DLLs\r
+if "%QTDIR%"=="" call \QtSDK\Desktop\Qt\4.7.4\mingw\bin\qtenv2.bat\r
 copy %QTDIR%\bin\QtCore4.dll qtdir\bin\r
 copy %QTDIR%\bin\QtGui4.dll qtdir\bin\r
 copy %QTDIR%\bin\QtWebkit4.dll qtdir\bin\r
 copy %QTDIR%\bin\QtXml4.dll qtdir\bin\r
 copy %QTDIR%\bin\QtNetwork4.dll qtdir\bin\r
+copy %QTDIR%\bin\mingwm10.dll qtdir\bin\r
+copy %QTDIR%\bin\libgcc_s_dw2-1.dll qtdir\bin\r
+copy %QTDIR%\bin\phonon4.dll qtdir\bin\r
 \r
 rem Image format plugins needed at runtime, but not debug verions\r
 xcopy %QTDIR%\plugins\imageformats qtdir\plugins\imageformats\r
@@ -33,22 +37,24 @@ copy %QTDIR%\translations\qt_*.qm qtdir\translations
 del qtdir\translations\qt_help*\r
 \r
 rem Generate the compiled translations\r
-lrelease gpsbabel_de.ts\r
-lrelease gpsbabel_es.ts\r
-lrelease gpsbabel_fr.ts\r
-lrelease gpsbabel_hu.ts\r
-lrelease gpsbabel_it.ts\r
-lrelease gpsbabelfe_de.ts\r
-lrelease gpsbabelfe_es.ts\r
-lrelease gpsbabelfe_fr.ts\r
-lrelease gpsbabelfe_hu.ts\r
-lrelease gpsbabelfe_it.ts\r
-lrelease gpsbabelfe_ru.ts\r
-\r
+rem lrelease gpsbabel_de.ts\r
+rem lrelease gpsbabel_es.ts\r
+rem lrelease gpsbabel_fr.ts\r
+rem lrelease gpsbabel_hu.ts\r
+rem lrelease gpsbabel_it.ts\r
+rem lrelease gpsbabelfe_de.ts\r
+rem lrelease gpsbabelfe_es.ts\r
+rem lrelease gpsbabelfe_fr.ts\r
+rem lrelease gpsbabelfe_hu.ts\r
+rem lrelease gpsbabelfe_it.ts\r
+rem lrelease gpsbabelfe_ru.ts\r
+rem for /f %%a in (dir /b *.ts) do lrelease %%a\r
+\r
+copy ..\msvc\Expat\libexpat.dll release\r
 \r
 "c:\Program Files\Inno Setup 5\ISCC.exe" setup.iss\r
 \r
 rem cleanup\r
 rd /q /s qtdir\r
-del gpsbabel_*.qm\r
-del gpsbabelfe_*.qm\r
+rem del gpsbabel_*.qm\r
+rem del gpsbabelfe_*.qm\r